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

Change-Id: I7f6628c0fa8bdc48d068c88a2f8c2c76cb81a035