Merge "Add mediaStore.waitForIdle before scans" into sc-dev am: aaa25bfc1f

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

Change-Id: I6c822f83ea1b17787745232a5da965aa5852d0a2