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

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

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