[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2415b67ba3 -s ours am: 2823a57d51 -s ours am: 2dbb4da80b -s ours am: d0ae6bd68c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15598031 Change-Id: I8df4db07160c19f7dcfa5d3678af8e3be6901d5b
This commit is contained in: