Android n mr1 preview 1
Merge \"CalendarProvider2: log failures to get the cached calling package.\" into nyc-dev
am: bcc65b8d27

Change-Id: Id804e50260260e434c4a32bc70692ca88724f702