[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d54097d3da -s ours am: 2fcccb7771 -s ours am: f18cc12af9 -s ours am: 6a0fb7d51a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15643363 Change-Id: Ib0012fb14db383afef3a5a95d4c8258249c0754b
This commit is contained in: