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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fe1bd862 -s ours am: 7e0dafdc -s ours" into rvc-d1-dev-plus-aosp am: 1abe53d9 -s ours

am skip reason: subject contains skip directive

Change-Id: I815092e6344017b3f4b6366857827b6a048d09bf