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

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



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