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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1665fcf1 -s ours am: a4ddfa28 -s ours am: fcd1e6bc -s ours am: f29375a2 -s ours" into rvc-qpr-dev-plus-aosp am: 040eb9e4 -s ours

am skip reason: subject contains skip directive

Change-Id: I3cae81e6aa8683a2ee1e222beeb91d7e8e36d894