Merge "Clean up the converted kotlin in NotificationRowContentBinderImplTest" into main