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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d4ea984 -s ours am: a8d797fe -s ours am: bbe71dc8 -s ours" into tm-d1-dev-plus-aosp am: 7dbc090a -s ours

am skip reason: subject contains skip directive

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



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