[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f8c312b928 -s ours am: b0eaff92c1 -s ours am: 5af60f2cb8 -s ours am: 1be8c68b17 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11964771 Change-Id: Ifaec250876d74f4e4559a5aa95d2e3fd2b7fdc2d
This commit is contained in: