Merge "Revert "Clean up correct state machine"" into main am: 1826699e am: 5db8f761

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



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