Merge "Handle MediaProvider#query exception" am: 896766d3c5

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

Change-Id: I066cef1f5636a4a93f6db1a69540994e8c64e00c