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

* commit '9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5':
  MediaSessionLegacyHelper uses global Application context