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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f7692bba -s ours am: a531ee87 -s ours

am skip reason: subject contains skip directive

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



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