Merge "Correct PendingIntent#getActivity() flags" into mainline-prod