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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 804c276a -s ours am: d34f2d50 -s ours

am skip reason: subject contains skip directive

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



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