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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: ad648cb0 -s ours am: e106452a -s ours am: fab0e10a -s ours" into rvc-d1-dev-plus-aosp am: 75e9440f -s ours am: 142ec293 -s ours

am skip reason: subject contains skip directive

Change-Id: Ic0d63800cb97e6798990cbb43631eeb3c5eb6d82