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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3280b6a0 -s ours am: c6b0a354 -s ours" into sc-qpr1-dev-plus-aosp am: 501c3dec -s ours am: 7dede397 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7107f2fc6f276db02ce374af0e3672f9dc5b598b