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

* commit '8f0953963d91a22021676cc29b0f572c1a913124':
  Tweak the behavior of the MediaSessionStack