MediaPlayer2: fix and move CloseGuard checking to MediaPlayer2

Test: build and boot
Bug: 112767549
Change-Id: I4e50f06c919e6666a08ba177bf9eb578fc224409
2 files changed