[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 6803b3a128 -s ours am: 9c842b6809 -s ours am: ef7605be2e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12960472 Change-Id: I89c0efdcbc31f673044fc8b6e135edba09d7d99e
This commit is contained in: