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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3da9404d -s ours am: 79c9e7d0 -s ours am: 2f139b37 -s ours am: 137aa40e -s ours am: d34cb965 -s ours

am skip reason: subject contains skip directive

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



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