[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 123c83e7...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 123c83e7 -s ours am: 5c42af1c -s ours

am skip reason: subject contains skip directive

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



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