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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6c3482b1 -s ours am: c03678a2 -s ours am: 432d2122 -s ours am: db18851a -s ours am: 1bb694be -s ours

am skip reason: subject contains skip directive

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



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