[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3042710c...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3042710c -s ours am: a6a7c312 -s ours

am skip reason: subject contains skip directive

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



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