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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f60538c1 -s ours am: cf72095a -s ours am: 35751244 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I313166e0f53b3b403070ba2c23a74ac33f04fa30