Merge "[automerger skipped] Import translations. DO NOT MERGE am: 7b0c49c2...

Merge "[automerger skipped] Import translations. DO NOT MERGE am: 7b0c49c2 -s ours am: a7949fea -s ours am skip reason: subject contains skip directive" into rvc-d1-dev-plus-aosp am: aca0c133 -s ours am: 9b411853 -s ours
am skip reason: subject contains skip directive

Change-Id: I8967a6a320fb5a20c68b9ccce8bfaf44f5159ae0