am 7a1b3309: am a71bb88d: Merge "Remove MediaFocusControl persisting media button receiver" into lmp-dev

* commit '7a1b3309d47a68a6d1bcaf509039b338c1509965':
  Remove MediaFocusControl persisting media button receiver