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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d1675be9 -s ours am: 42c4093f -s ours am: c220ab12 -s ours am: ee34a9f9 -s ours am: 8ab248ae -s ours

am skip reason: subject contains skip directive

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



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