Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours am: 8a673b874f -s ours am: ac342cc50c -s ours" into rvc-qpr-dev-plus-aosp am: cd7e79c655 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12184422 Change-Id: I40ec2997b595507ff86561eac1e34ac0a3085c69
This commit is contained in: