[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42e8e31f...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42e8e31f -s ours am: 2bb29469 -s ours

am skip reason: subject contains skip directive

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



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