Merge "Grant default ringtone picker storage permissions" into oc-dr1-dev