[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 218b61acf4 -s ours am: 7b142fb0e4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12156601 Change-Id: Iddf2762536e113b8c2cced7cc65492a2329f7d12
This commit is contained in: