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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3804ef39 -s ours am: 71852ff2 -s ours am: b73e6f38 -s ours" into udc-d1-dev-plus-aosp am: e9437a13 -s ours am: 156b2b7f -s ours

am skip reason: subject contains skip directive

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



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