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

Change-Id: I99eb05c54e8c90d94a2cd45fa929371869c22350