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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fc39f464 -s ours am: 8651dbc3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie60caa1b1a1c5e7e9ded852b87bfe3aeeee87a0b