[automerger skipped] Merge "[DO NOT MERGE] Split access-media-storage from read-external-storage" into qt-dev am: 3b050525e4 am: c6ef7c0e79 am: aa4c711fa1
am: 04e9955aa8 -s ours
am skip reason: subject contains skip directive

Change-Id: I9319a212a072fcff9ed92d3a1472d2735eb8662c