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