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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I345d74d2db57a0ab4c699b86835d491aceffaa8f