Merge "Fix User Level READ_EXTERNAL_STORAGE Permission" am: a6dc51cb60 am: 05ea29dfa5
am: ee75c4f29f

Change-Id: Iab3ccd48917ec68bc64ff744e14903edd7b44dd0