Merge "Grant provider permission" am: 0c695b2b28

Change-Id: I60c49a0d6dbc2e1b4fcbb601206be7f74656ecd4