Merge "avatar: refactor handle_suspend_cfm_bad_state_error" into main am: e99f6d33 am: 2799dd55

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



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