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

Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 85215ae5 -s ours am: 68c66edb -s ours" into rvc-d1-dev-plus-aosp am: f5dc9cbd -s ours" into rvc-qpr-dev-plus-aosp am: 69928261 -s ours

am skip reason: subject contains skip directive

Change-Id: I5eab57211e931c41833a464dc1a0d05513bf5627