Merge "[ExpandableNotificationRow] Add missing expanded unit tests" into main