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

Change-Id: I5e92a710d55d91f66be9e1f7dda7fa92b59534fd