Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am: 84bb2293ae
am: ff985c6bc7

Change-Id: I9c2c99a0f3999c550195b4ed7eed5a31caea9d2a