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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 36be44fa -s ours am: cd73b1f4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I02187b903608c16a94d00e7eeddecf3c012ffc71