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

* commit 'a71bb88da69813a9f8f77a852e80960cba35f87b':
  Remove MediaFocusControl persisting media button receiver