Merge "MediaSessionService: Nullify the media button sesison when it's removed" into oc-dev am: 3d5f41bb am: 5170ae76 Change-Id: Ibdd616ad192fb72cdce2a8be1b56efb2601e1eb8