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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b -s ours am: e4c51ab8 -s ours" into sc-qpr1-dev-plus-aosp am: e83409a8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9756c08d27bafc817940099b5b5fb827e2233386