[automerger skipped] Merge "Fix MediaProvider impl scanFile to scan as MediaProvider" into mainline-prod am: 018c9d5c00 -s ours

am skip reason: Change-Id Iaba557a58afa9c8adc6c7f18490bc5651db9e581 with SHA-1 aecd89e186 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c708e861f82859ad72d3d5b7e12d4a4e5180f04