Merge b2c72007e038749fd46fb286db6801254a326f39 on remote branch

Change-Id: I4b34101ba987e8a04135f2cfaa0faed7e106e634
diff --git a/system_bt_ext/conf/interop_database.conf b/system_bt_ext/conf/interop_database.conf
index 238b21b..536990d 100644
--- a/system_bt_ext/conf/interop_database.conf
+++ b/system_bt_ext/conf/interop_database.conf
@@ -214,6 +214,7 @@
 # Disable role switch policy for headsets/car-kits
 # Some car kits initiate a role switch but won't initiate encryption
 # after role switch complete
+# B8:69:C2:9C:20:A8 - JBL Charge 2+
 [INTEROP_DISABLE_ROLE_SWITCH_POLICY]
 00:0D:FD = Address_Based
 00:1B:DC = Address_Based
@@ -221,6 +222,7 @@
 A4:15:66 = Address_Based
 00:54:AF = Address_Based
 00:23:7F = Address_Based
+B8:69:C2 = Address_Based
 
 # certain remote A2DP sinks have issue playing back Music in AAC format.
 # disable AAC for those headsets so that it switch to SBC