Merge "Allow both contentIntent and setOnClickPendingIntent in notifications"