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: bc336f50 -s ours am: 095c6a78 -s ours am: 62cf8a14 -s ours" into sc-qpr1-dev-plus-aosp am: d78d8085 -s ours am: 8bedf85d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia9cf6e20d6ec796e5afd82b7a333b6bae5eae469