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

* commit '69fd01d3e6e8e94eafdb6d424f92a32ada93096d':
  MediaSessionLegacyHelper uses global Application context