Merge \"Merge \\\"CalendarProvider2: log failures to get the cached calling package.\\\" into nyc-dev am: bcc65b8d27 am: e34e1daee9\" into nyc-mr1-dev-plus-aosp
am: a3133a37a4

Change-Id: I2bf9f7417d66054ace0fc7436fee3f7c402e30be