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