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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cab1c018 -s ours am: 1f3808cc -s ours am: 618576da -s ours am: d93101d2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9192892a03e05e540f617a4fe8318aa189326ae6