Merge "Fix MediaProvider impl scanFile to scan as MediaProvider" into mainline-prod