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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7aa5b141 -s ours am: cfd65af0 -s ours am: cf52747a -s ours am: a8ab9151 -s ours

am skip reason: subject contains skip directive

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



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