[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: ef038933 -s ours am: 69ef79b9 -s ours

am skip reason: subject contains skip directive

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



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