Merge \"Pre-grant calendar permission to default email app\" into nyc-mr1-dev
am: 993b4b2380

Change-Id: Idf414e58b8b0a69e2d8dc2b2e85c089068738119