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