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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 61d2cb4f -s ours am: 2f84cf5d -s ours am: 3f3bbfc4 -s ours am: 6ecb419b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie374e360e0aa33d97b39ea6123233df5d0969284