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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: fec4ac95 -s ours am: d98cb227 -s ours am: ee5d0989 -s ours am: b1d5e2a0 -s ours

am skip reason: subject contains skip directive

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



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