Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8150894a31 -s ours am: 9caa07c236 -s ours" into rvc-qpr-dev-plus-aosp am: 0cfbde6011 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187281 Change-Id: I0a3285bf48b00116eedb433f9f49f86bfd286a35
This commit is contained in: