Merge "hap: Fix missing null device checks" am: cfc4b2f5 am: 1374a0e0 am: 9701c928

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



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