Merge commit '07772caf5ca22365dd62bc042de179a4da55f665' into remote

Conflicts:
	device/include/interop_database.h

Change-Id: Ib74501079c29033065b1fa2335777c69edcfda23

diff --cc btif/src/btif_av.c
Simple merge

diff --cc btif/src/btif_media_task.c
Simple merge

diff --cc device/include/interop.h
Simple merge

diff --cc device/include/interop_database.h
index 78f9e75,c1b4017..c941d89
--- 1/device/include/interop_database.h
--- 2/device/include/interop_database.h
+++ b/device/include/interop_database.h
@@@ -153,10 -160,7 +160,11 @@@ static const interop_name_entry_t inter
    //Below devices reject connection updated with preferred
    {"BSMBB09DS", 9, INTEROP_DISABLE_LE_CONN_PREFERRED_PARAMS},
    {"ELECOM", 6, INTEROP_DISABLE_LE_CONN_PREFERRED_PARAMS},
 +
 +  // HID Moto KZ500 Keyboard - Problematic SDP digitizer descriptor
 +  {"Motorola Keyboard KZ500", 23, INTEROP_REMOVE_HID_DIG_DESCRIPTOR},
 +  {"Motorola Keyboard KZ500 v122", 28, INTEROP_REMOVE_HID_DIG_DESCRIPTOR},
+   {"MB Bluetooth", 12, INTEROP_ADV_AVRCP_VER_1_3},
  };
  
  typedef struct {

diff --cc device/src/interop.c
Simple merge