Merge "Remember what stage of service discovery are we during bonding" am: 69a8fbed

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



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