am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev

* commit '2d7a1b09e93aec3baeb16f46fb203ae14555d4a7':
  Route mute key events through MediaSessionService