Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 11e5fdf1ee -s ours am: 122dda0e61 -s ours" into rvc-qpr-dev-plus-aosp am: 51322aa337 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11888298 Change-Id: I3e6d986ab7f70130ecf04b2aed3780a6195e0d01
This commit is contained in: