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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96bf079d -s ours am: 2220f4a2 -s ours

am skip reason: subject contains skip directive

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



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