Merge "Make granting default SMS and Phone permissions robust" into mnc-dev