Merge "Remove ScanFile after unlink for ROOT_UID" into rvc-dev am: 90d78a374f

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

Change-Id: I0fd56f74cdba13e018707917c55f703d3dece923