Merge "Catch crashes in onScanVolume" into udc-mainline-prod am: 375964fe66

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

Change-Id: Ia599860908975056c1707e7c9108eb0602406c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>