Merge "[RESTRICT AUTOMERGE] Make MultiClient IMMS PendingIntent IMMUTABLE" into sc-v2-dev