am 91bba400: am 8f095396: am 7fbcac6a: Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev

* commit '91bba400731c866e2aa9a9237e071d754cea8d20':
  Tweak the behavior of the MediaSessionStack