Merge changes from topic "hfp-client-connection-service-package" am:...

Merge changes from topic "hfp-client-connection-service-package" am: dcc6879e am: 5c1c1859 am: 1189b2a5 am: 54f34bdd

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

Change-Id: Ibd40abb70b7f497bdcc923eefecd429dfe43e30b