Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8a0b3854ca -s ours" into sc-dev am: 1319f44dae -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946274 Change-Id: Idec2fe25be3fe0e77753ef0cf511b96b344673cb
This commit is contained in: