[automerger skipped] Merge changes from topic "hfp-audio-state-api-cleanup"...

[automerger skipped] Merge changes from topic "hfp-audio-state-api-cleanup" am: 2d2bcc4f am: 189e880c am: 7fb0f9fe -s ours am: 1bfb8299 -s ours am: 5688c9e9 -s ours

am skip reason: Merged-In I76185f21538e38b719b649399af5e15795a34c24 with SHA-1 20b0acf2 is already in history

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

Change-Id: I7b85dbf79d825638d927cdfdd8475ddd67d2e3a5