Merge "MediaSessionService: Nullify the media button sesison when it's removed" into oc-dev
am: 3d5f41bb03

Change-Id: I136548911db0faf018fef046a0a81323c45479de