Merge "Fix error checking logic -- "if it doesn't have a value"" into tm-dev...

Merge "Fix error checking logic -- "if it doesn't have a value"" into tm-dev am: 55d4ad8d am: 6eb2a471

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



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