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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: d4566595 -s ours am: 1af46069 -s ours am skip reason: subject contains skip directive" into rvc-d1-dev-plus-aosp am: a171bb2b -s ours am: 7ed851d8 -s ours
am skip reason: subject contains skip directive

Change-Id: I808a41744335cbb45c883bc4582a132374466af3