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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2bce6252 -s ours am: 3ba8073d -s ours am: ffd887f1 -s ours am: b6af3f08 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ideb25d6cd7c57812024e3072a3257a5bfba99e23