Merge "Revert "Modify Media provider such that app-shared picker-URIs c..."" into tm-mainline-prod