Merge "Clean up correct state machine" into main am: 8f4ff99a

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



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