Merge "Revert "Remove media players if their backing session dissappears""
am: bb81ed590d

Change-Id: Id1b80605c1b419e757dec67b027fd1ea7004e34d