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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ce29e7fe -s ours am: fe4b7019 -s ours am: fc5cd9f3 -s ours am: 1b625903 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib515ee151fd32735242189407802be54fa0b5007