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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 0b66fab3 -s ours am: 9620d62a -s ours am: 9b4c28a9 -s ours am: f366b712 -s ours am: b10fd9aa -s ours

am skip reason: subject contains skip directive

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



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