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: 1758ca42 -s ours" into tm-d1-dev-plus-aosp am: 36d422f7 -s ours

am skip reason: subject contains skip directive

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



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