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

Change-Id: Idbf51e0059f6158e5c279564c22cfef9d1c20bd3