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 skip reason: subject contains skip directive

Change-Id: I5f2a7cd9eeb23d20c9ba0caab2991b4b9be61fa7