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

Change-Id: I384adfd25bc4418469fcee4df1843594bf9d2d51