Merge "Add ExpandableNotificationRowBuilder to test utils" into main