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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 0bd8ac43 -s ours am: 7d047171 -s ours am: 4ea305f7 -s ours am: 620ec5cb -s ours am: 468a4fcb -s ours

am skip reason: subject contains skip directive

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



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