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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ffc586ab -s ours am: bd6eb679 -s ours am: b2a1be09 -s ours am: 179b3ec2 -s ours am: 0dde4d33 -s ours

am skip reason: subject contains skip directive

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



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