Merge "Flag for prevent pairing state reset due to unrelated service...

Merge "Flag for prevent pairing state reset due to unrelated service discovery" into main am: 0e6aa8dc am: 3e43346a

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



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