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

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



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