[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8c93c6c3d1 -s ours am: 71ca4d10b6 -s ours am: 8069e11b38 -s ours am: 4886b1b5e8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12960756 Change-Id: Ie1a58c04fc1df33f0f8760bafeeb8016c74d4495
This commit is contained in: