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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7248b3c -s ours am: 2f0846d1 -s ours

am skip reason: subject contains skip directive

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



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