Merge "Ignore SDP replies while discovery is inactive" am: 1b7b2b4b am:...

Merge "Ignore SDP replies while discovery is inactive" am: 1b7b2b4b am: 4f47d105 am: ff32bc3f am: d79b1451

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



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