Merge "Replace PendingIntent @hide APIs"