Merge "AudioService: Restore volumes after boot and when a headset is plugged" into cm-10.1
ServiceState: add support for DCHSPAP

Change-Id: Ib0a328652c14580718400b00146b770481be5458