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

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



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