Merge "Add null check for pendingIntent2 ProtoLogs" into main