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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6d71646f -s ours am: 41bd00fd -s ours am: 4797f8c1 -s ours am: a01ec635 -s ours am: 85540403 -s ours

am skip reason: subject contains skip directive

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



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