Merge "Remove active device handling for HAP devices" am: 544d05bc am:...

Merge "Remove active device handling for HAP devices" am: 544d05bc am: 5886e259 am: 1529671e am: af5ec4c5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2498877



Change-Id: Ie069d3601179792c53ad416f92a2849047990ae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>