Media: Make sure mVolumeController is not null

* mVolumeController is throwing NPEs all over the place in this class, which
  causes apps like Chromecast to shit the bed when using Google Play Music
  and/or Google Play Movies
* Catch additional exception on try/catch already in place and throw in a null
  check to prevent apps from crashing until null mVolumeController is rectified

Change-Id: I7a883aa85256d5dc6af6f37978676b136cb40d0d
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
Merge "Media: Make sure mVolumeController is not null" into kitkat
SystemUI: Allow theming battery via theme chooser

Change-Id: Iebea2dab0ed89baa14c0f18a4c8f487cdb8313a6
alarms: clean up duplicated sounds

another mess...

Alarm_Classic == Oxygen == Cesium
Promethium == Platinum
Argon == Fermium
Nobelium == Neon
Helium == Hassium
Plutonium == Krypton
Neptunium == Carbon

Change-Id: I29330a50a2538a5e3cf3af99d4f7bf1b17de7aca
Merge branch 'kitkat' of https://github.com/AOKP/frameworks_base into kitkat