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

Change-Id: I4961cb11c39a3163c3411f59753fb7765d4bd1e1