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

Change-Id: I7aebf2380ca19fa38abea58d5e8a14e5f32a431b