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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 236f1bc1 -s ours am: cfc597f9 -s ours

am skip reason: subject contains skip directive

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



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