[DO NOT MERGE] Split access-media-storage from read-external-storage am: f3ff750f29
am: 6f0fe03b7d

Change-Id: I15e195939f892f9bd34506ccdabeb6324173b446