[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fb24970...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fb24970 -s ours am: 83baf873 -s ours

am skip reason: subject contains skip directive

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



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