Android CTS 7.1 Release 21 (4976769)
Merge \"CalendarProvider2: log failures to get the cached calling package.\" into nyc-dev
am: bcc65b8d27

Change-Id: I738a86b17cef357e6ac8de2709942ef465ff7691