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

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



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