[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: df2ad26e2d -s ours am: c1fc82c520 -s ours am: 25f0a8c973 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12959672 Change-Id: Ia87fee5c09f1e15afec9cb75c97dc617b21fb4a2
This commit is contained in: