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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 282960b5 -s ours am: 25485e58 -s ours

am skip reason: subject contains skip directive

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



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