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: 48c12de1 -s ours" into sc-dev am: 5f47a376 -s ours am: 044a8d6e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7c6bf712fe3f166dc8ec6cd63d00c0909a5c79cf