Merge changes from topic "HFP-SCO-management" into main am: f3531c57ea am: 7ee4289ef1 am: 3f9deaad66

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824291

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