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

am skip reason: subject contains skip directive

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

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