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

Change-Id: I4c61e048169c42d27cdb72d2050b81c65defc415