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

Merge "Revert "Clean up correct state machine"" into main am: 1826699e am: 9db78c99 am: a6b3e3d3

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



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