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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 865142d7 -s ours am: 6c021b9a -s ours

am skip reason: subject contains skip directive

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



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