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