am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev
automerge: 20e52c3

* commit '20e52c3453b2683cccfc4ac0841c9d6ef0796f88':
  MediaSessionLegacyHelper uses global Application context