[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: eab7394b -s ours am: 7b613ed1 -s ours am: 89df6231 -s ours

am skip reason: subject contains skip directive

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



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