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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 57effef0 -s ours am: edaac8a1 -s ours am: 0497eb5b -s ours am: 8b7f7503 -s ours

am skip reason: subject contains skip directive

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



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