Merge changes from topics "hap_delete_preset_and_get_notify",...

Merge changes from topics "hap_delete_preset_and_get_notify", "hap_test_active_and_available_preset" into main am: 92851f46 am: 54b2f04c

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



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