[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6188def997 -s ours am: 226f1ac296 -s ours am: ac9b41fe6f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15209702 Change-Id: I06af8bfb28e2e6263e67cf02f0a4d2c8728888c7
This commit is contained in: