Merge "Floss: Prevent phone state desync with AG when answering/hanging up by...

Merge "Floss: Prevent phone state desync with AG when answering/hanging up by HF." into main am: dfbf5260

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



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