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: Ie5172b00de5120876dbaae4909ead750deb5f2dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>