Merge "Fix User Level READ_EXTERNAL_STORAGE Permission"
am: a6dc51cb60

Change-Id: I08b2f1e563ff1cb450298bc4bf255f487c6b4efb