[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am:...

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c185f53b -s ours am: d04cae90 -s ours

am skip reason: subject contains skip directive

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



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