Merge "Grant default ringtone picker storage permissions" into oc-dr1-dev
am: 8039ac418f

Change-Id: I8c3575d974a5266b62d560508df1253ba80fb0e4