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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96899bff -s ours am: 5baacd81 -s ours

am skip reason: subject contains skip directive

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



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