Merge "Revert "Handle music key event in CarInputService"" into nyc-dev