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

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1420588

Change-Id: I58a3e97a45b4b1b030d9840e640a5aab10e6afbd