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: 313fbca5

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



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