am 22c63b99: Merge "Ensure MediaSessionCompat.Callback behavior matches framework" into lmp-mr1-ub-dev

* commit '22c63b99c2e69f5a87b21887ece75c19112f99fe':
  Ensure MediaSessionCompat.Callback behavior matches framework