[automerger skipped] Remember what stage of service discovery are we during...

[automerger skipped] Remember what stage of service discovery are we during bonding am: e771ffa3 am: f3dc2088 -s ours

am skip reason: Merged-In I1e91469fce49c0f544c979587f7ffb8ecac3b076 with SHA-1 157bb2ed is already in history

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



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