[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: 2e63ba4e -s ours

am skip reason: subject contains skip directive

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



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