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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85457152 -s ours am: 7fc396b8 -s ours am: 99f73635 -s ours am: 460ba8c4 -s ours

am skip reason: subject contains skip directive

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



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