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

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



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