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

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

am skip reason: subject contains skip directive

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



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