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

Change-Id: Id788315e6ad9a5fe72287fb922c77d7df03ea82b