Merge "[DO NOT MERGE] Split access-media-storage from read-external-storage" into qt-dev am: 3b050525e4
am: c6ef7c0e79

Change-Id: I52a6017d8a55bd95b0ee4b9482161204c2743beb