Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: dd2e7d498d -s ours am: 45e1c0131b -s ours" into rvc-qpr-dev-plus-aosp am: f886beded5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12295622 Change-Id: Ieddf3b4c06ca6ec5bd80ebb1976310b8093f5c83
This commit is contained in: