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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68e -s ours am: 2683d9d7 -s ours am: a48f918f -s ours am: 7d64542b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0556b506073a4a541bd0f211d10aa54af3098352