IA2: Combine disc state machine and disc actions am: 9fcc5480 am: 5f61fc03...

IA2: Combine disc state machine and disc actions am: 9fcc5480 am: 5f61fc03 am: 4233abe0 am: 14b0b764

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



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