[automerger skipped] Merge "[DO NOT MERGE] Split access-media-storage from read-external-storage" into qt-qpr1-dev am: 0698185471
am: 25c6efe338 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaec2a87cfbda8c1b36812ef2e7872bbd1de2a27c