Merge "[automerger skipped] Merge "Correct PendingIntent#getActivity() flags" into mainline-prod am: 522e0728 -s ours"