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

am skip reason: subject contains skip directive

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

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