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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 423c0fab -s ours am: 2ce5dbb0 -s ours am: 3cfc00e5 -s ours am: 391effa4 -s ours am: 8811a128 -s ours

am skip reason: subject contains skip directive

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



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