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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8c1c08f1 -s ours am: 26640bd2 -s ours am: f17bb897 -s ours am: 23b3410d -s ours am: 366a2e48 -s ours

am skip reason: subject contains skip directive

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



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