[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31b40c17...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31b40c17 -s ours am: 7e149d00 -s ours am: ca8cd2bd -s ours

am skip reason: subject contains skip directive

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



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