Merge "Pre-grant calendar permission to default email app" into nyc-mr1-dev