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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04acade1 -s ours am: 25607da6 -s ours am: 521a04ac -s ours" into udc-d1-dev-plus-aosp am: 94ee20e9 -s ours

am skip reason: subject contains skip directive

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



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