Merge "Add null check before string comparison" am: 2893fc93 am: 3bfe1a6d...

Merge "Add null check before string comparison" am: 2893fc93 am: 3bfe1a6d am: 2d5ff9e2 am: 48031519

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



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