[automerged blank] Fix MediaProvider impl scanFile to scan as MediaProvider 2p: aecd89e186

Blank merge reason: Change-Id Iaba557a58afa9c8adc6c7f18490bc5651db9e581 with SHA-1 d6431c76d9 is in history

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

Change-Id: Ib72084f220ba5c102faf9491d94a8328f2e05750