Merge branch 'pie-gsi' of https://android.googlesource.com/platform//packages/providers/MediaProvider into HEAD

Change-Id: I25e507c5cebd002a223f332728a046e9aa9da9dc