Merge "[automerger skipped] [automerged blank] Import translations. DO NOT...

Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fda4c116 am: de8a27e8 -s ours am: 85d763e5 -s ours" into tm-d1-dev-plus-aosp am: 1cf3126b -s ours am: 9ff5a31b -s ours

am skip reason: subject contains skip directive

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



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