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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e0d06227 -s ours am: 66a2fc6e -s ours am: bef08f07 -s ours am: c468d543 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0472c03ab4fef70e1a5ef34df073743d3260d852