Move CM config options after AOSP config options

Change-Id: I641a350fc9b6cc3af60ee818f90a826aba64f087
Audio: Organize, include only newer ringtones

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

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

Change-Id: I7215f503244c5ee277e83d60d6960f18559acfb9