[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: b630b27967 -s ours am: 8ea3acc482 -s ours am: 7648892f7a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12960639 Change-Id: I70997f06fc884d25ccca602d2f2fecd1f624c992
This commit is contained in: