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

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

Change-Id: I73cafea189558aebee077223cd3e739f4b2609e2