Merge tag 'android-9.0.0_r42' of https://android.googlesource.com/platform//packages/providers/MediaProvider into HEAD

Android 9.0.0 release 42

Change-Id: I228f760a82fdbeaee040a91020278bf67ad22f95