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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 625f2822 -s ours am: ecea6d10 -s ours am: 6f6ceac5 -s ours am: 798b55e8 -s ours am: 60a0825a -s ours

am skip reason: subject contains skip directive

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



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