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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3e1cf7f5 -s ours am: 517eb9e6 -s ours am: cfba62de -s ours am: bafc73dc -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia4e69a83674230226be89dc294f4ed6add8de8c5