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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: af9f89d9 -s ours am: a9ed7784 -s ours am: 14b2e942 -s ours am: 7edf31c4 -s ours am: 077f75ad -s ours

am skip reason: subject contains skip directive

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



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