Merge "Security fixes for PendingIntent related apis in LauncherApps" into sc-dev