Merge "Adds new PendingIntent-based APIs for ContextHubManager"