Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea82d90e45 -s ours am: ddf6d2b666 -s ours" into rvc-d1-dev-plus-aosp am: 39779af8fd -s ours am: 6d87612eea -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12951854 Change-Id: Ie41b839e1aaae3b8285d8a39f1e99df550c08b3d
This commit is contained in: