[automerger skipped] Merge "Fix error checking logic -- "if it doesn't have a...

[automerger skipped] Merge "Fix error checking logic -- "if it doesn't have a value"" am: 3a8da543 am: fc82a0c4 -s ours

am skip reason: Merged-In I899300b90103259613afa077276f2fce10a39682 with SHA-1 6a222a4a is already in history

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



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