Android mainline 10.0.0 release 10
[automerger skipped] Import translations. DO NOT MERGE am: e983b7a383 -s ours
am: 2aeb885676 -s ours
am skip reason: subject contains skip directive

Change-Id: I31bb5b947534de90014831cde3ea735ae6b459d4