[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 90b0d3f83e -s ours am: 228aa6e038 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib1bd570ab0bf5aebc2ef61ea9844de6b93c9b72e