Merge "Revert "Handle music key event in CarInputService"" into nyc-dev
am: 3a83966

* commit '3a83966887d9554a0e9f1a92d9f6e1f2a43aaac6':
  Revert "Handle music key event in CarInputService"