Merge "Cleanup in ExpandableNotificationRowTest"