[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98af4dbe78 -s ours am: 7eba26bb3f -s ours am: 17e594d97f -s ours am: 72e90cdbc9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542429 Change-Id: Ifd21c48a4f8807003f22a55a37c3cda30dfb900e
This commit is contained in: