Merge "Fix failure in h4 recovery logic" am: 06c1463a am: 578b0d76 am: 342dc180

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



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