Merge changes If313aef4,I388fcb9d into sc-dev am: e1d52af901

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

Change-Id: Ib31bdd8f9f7e253b20701cfa94ec957e9cb264dd