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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b415ead -s ours" into sc-dev am: a71fe535 -s ours am: 856bd3f0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7f5231c1d5020244cb90b44c0fcef937c44e5eb5