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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 990cf2f9 -s ours am: 71a6f124 -s ours am: ec609c18 -s ours am: af68ede6 -s ours am: ee8d7f19 -s ours

am skip reason: subject contains skip directive

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



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