[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2c1b17f6c9 -s ours am: 67933dbf84 -s ours am: 12a15eee7f -s ours am: 16a306fc1b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15201714 Change-Id: I90f830a378c23fa08b999d52d7657026ade7a550
This commit is contained in: