[automerger skipped] [DO NOT MERGE] Split access-media-storage from read-external-storage am: ac7b10c135
am: 2a5ee6ec38 -s ours
am skip reason: subject contains skip directive

Change-Id: I22bf19ce5a9c3d767093fbac8ecac4c984fcaffc