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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4f374e45 -s ours am: 366f88e8 -s ours am: dd21f6c5 -s ours am: 2833e3eb -s ours am: 98aad557 -s ours

am skip reason: subject contains skip directive

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



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