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 am: 27615d95

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



Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6012831df0bf68ad2f5a85e7e6bd65757031e38d)
Merged-In: I5ece310289784be3ce725f957755c915d0f5b20e
Change-Id: I5ece310289784be3ce725f957755c915d0f5b20e