Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into...

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278 -s ours am: 1d1de27f -s ours" into rvc-d1-dev-plus-aosp am: 7fda4abb -s ours am: 7fad9b65 -s ours

am skip reason: subject contains skip directive

Change-Id: Iac9595688af7a9c4023dc4534ed1b79ece796031