Merge "Remove GALLERY_PROVIDER permission usage"
am: 7882a15eed

Change-Id: Iecf637cdf15caf1e10f50d265eb0b383664c48d7