Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7a33282392 -s ours am: 482997c563 -s ours am: 794dee40c1 -s ours" into rvc-qpr-dev-plus-aosp am: 6a9ab1bd5a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12134821 Change-Id: I635e89118a8c6011942a0542ccc6ec65a4f073b7
This commit is contained in: