Merge "Update some Nullable annotations on PendingIntent" into sc-dev