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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 04dc80ee -s ours" into sc-qpr1-dev-plus-aosp am: 11abb875 -s ours am: faf6bce9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4a71e5291413a1d98b6465dafd97fbd8cb2b3fd6