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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 2d7377f5 -s ours am: f531605f -s ours am: f5ba66b9 -s ours am: a8e3c121 -s ours am: 9b13b04a -s ours

am skip reason: subject contains skip directive

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



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