Merge changes from topic 'pts-test-fix-sync-20160335-1' into nyc-dev
* changes:
Fix more merge issues in BluetoothPbapVcardManager.java
PBAPS: Don't filter out DateTime when requested
PBAPS: Fix duplicate entries fetched from database
PBAPS: Get vcard when asked in alphabetical order
PBAPS: Enable contact search with full or part of given string
SAP: Fix ANR(s) in SAP server code
SAP: Remove sdp record while BT is being turned off to prevent leak
SAP: Fix issue of socket listener not getting re-started
SAP: Update UI connection and notifications properly
SAP: Handle disconnect request during call ongoing state
OPP: Update share status when interrupted at remote side.
OPP: Use long instead of int
MAP: Fix ANR for blocking operations on UI thread
MAP: Track ProfileState, register and unregister of BroadcastReceivers
MAP: CleanUp for SDP record in MAP Service shutdown
MAP: GETMessagesLisitng include mandatory field always.
MAP: Cleanup PendingIntent in cancelUserTimeoutAlarm.
MAP: Handle possible NPE while disconnect map.
MAP: Add MNS SDP Search during setNotificationRegistration.
MAP: Declare and fetch only 'INTERESTED_MESSAGE_TYPE_CLAUSE' MMS.
MAP: Synchronize notifcationReg reply and MNS connect action.
Send error for if VR is initiated during call.