Android Mainline 10.0.0 Release 7 (6046485)
[automerger skipped] Import translations. DO NOT MERGE am: f1e80dffbc -s ours
am: ed54922c14 -s ours
am skip reason: subject contains skip directive

Change-Id: I827a34bc9e7b6ed53cabf21d47c60d8c5d136bf4