Merge "Fix null pointer dereference" am: e4253608 am: 9d3aef18

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



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