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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a132116 -s ours am: 196033d8 -s ours am: c64ed637 -s ours" into sc-qpr1-dev-plus-aosp am: e7a5c02c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I67dc66ae7b1cbaa41a5a07cfc7e2ead1a53c8d07