Cleanup: Use only one method to shut down the service instead of two.

Also make sure to release the audio focus when removing the notification
due to being idle in order to remove the play controls from the
lockscreen.

Change-Id: I323db520ce107235ebe774109d0a3338688328b4
Merge "Cleanup: Use only one method to shut down the service instead of two." into cm-10.1