[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours am: 69d06e9fb7 -s ours am: c460f19873 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544163 Change-Id: I68840f5731d84e334047cbc171cd60f625fbc937
This commit is contained in: