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: d4eb3a12 -s ours" into sc-dev am: 465138d6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic95fa892a39b4560a2302f4e92cc2060eca927e9