[1/3] Base: Audio Themes Support

Conflicts:
	media/java/android/media/AudioService.java

Fw/av: http://gerrit.dirtyunicorns.com/#/c/2149/
Settings: http://gerrit.dirtyunicorns.com/#/c/2156/

Change-Id: Id80dc7f0bcbd39b5305d6ea0fb8bd9fa516f3634

Conflicts:
	core/java/android/provider/Settings.java
	media/java/android/media/AudioService.java