[automerger skipped] has_client: Improve subscribtion to control point am:...

[automerger skipped] has_client: Improve subscribtion to control point am: 7976c59b -s ours am: a654f1c0 -s ours

am skip reason: Merged-In I7c30278de00e3e75c6ecd9b6c55258b7eef92fe9 with SHA-1 967aa140 is already in history

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



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