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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 65328be1 -s ours am: 8cd5598c -s ours am: 99fd3cdf -s ours am: 23d2d2fd -s ours am: 40af4843 -s ours

am skip reason: subject contains skip directive

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



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