Unbreak merge failures

Change-Id: Ifc0141f1d594e1f5e04ee8532c985e6b3d480fb3
Bluetooth: SAP: Add framework changes to support SAP

This change consists of:
SAP Disconnect from server support related changes

Change-Id: I7215f503244c5ee277e83d60d6960f18559acfb9
AudioService : Fix NPE

Initialize mVolumePanel prior to registering the receiver,
since 4.3 now invokes the layoutDirection call on it.

Change-Id: I8d00f0886b603d52bc55cba5fd3ba1d86f7ea56c
Merge "AudioService : Fix NPE" into cm-10.2
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2