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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 31dc2a20 -s ours am: 4e0582ff -s ours am: 1bc03e05 -s ours am: ab59ccea -s ours

am skip reason: subject contains skip directive

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



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