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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 204ea4a6 -s ours am: 563fe111 -s ours am: 0291ea6b -s ours am: af4727f3 -s ours am: 1d341234 -s ours" into udc-d1-dev-plus-aosp am: 15456d46 -s ours

am skip reason: subject contains skip directive

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



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