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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 64e65ae0 -s ours am: 821dfa57 -s ours

am skip reason: subject contains skip directive

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



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