[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: f4d7f518 -s ours

am skip reason: subject contains skip directive

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



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