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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: efedfa23 -s ours" into sc-dev am: 3c65d955 -s ours am: 0e6246c3 -s ours am: bd4db24d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544121

Change-Id: Ib7d98c991b6aef7e67234f5d599e63eeb13fc5b9