Merge "aics: add test discover as secondary service" into main am: f4ed978a

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



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