Android Mainline 10.0.0 Release 6 (6008993)
[automerger skipped] Import translations. DO NOT MERGE am: 37d6ed4f7f -s ours
am: e8f3bc8c31 -s ours
am skip reason: subject contains skip directive

Change-Id: If519bda4e765b8842b84b6bc3a4a280deb038d35