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

Change-Id: Ic62a47c781c9a5157060f3311f2d6c7a6a22eb5a