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

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

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