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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cdbb1021 -s ours am: 26180899 -s ours am: 7931a1fa -s ours am: bb6d5eed -s ours am: 22d0704f -s ours

am skip reason: subject contains skip directive

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



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