Merge "Revert "Add the Haptics team to RingtonePlayer/NotificationPlayer OWNERS."" into main