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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42e6d43b -s ours am: ebf5e8a9 -s ours

am skip reason: subject contains skip directive

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



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