[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d916565...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d916565 -s ours am: 15d274c1 -s ours

am skip reason: subject contains skip directive

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



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