[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8e36e46a45 -s ours am: 8c21e4804f -s ours am: 8fea045c00 -s ours am: 10670904b6 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15695548 Change-Id: I4ea97c67cd22e6241fab0681a4c7970883ae0f40
This commit is contained in: