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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c9b2fc3 -s ours am: 913f57d4 -s ours am: d5899d88 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I85dbdec1699c6eeb1eaa67afae8a2e6856fc1b73