Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:...

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c5fd1fb -s ours am: df918e22 -s ours am: 6493ff2d -s ours" into udc-d1-dev-plus-aosp am: efcaf92a -s ours am: 210ee172 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24317045



Change-Id: Ibf68b8f19014482f2cf981c3384dbff91865e308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>