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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 2047b8b1 -s ours am: 2f687582 -s ours am: ab590f6c -s ours am: 8a9c23c9 -s ours am: 29098847 -s ours

am skip reason: subject contains skip directive

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



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