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

Change-Id: I49c186fe61b292586ff1baf086e0fb8ac69903b6