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

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

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