Merge "Floss: suspend and resume discovery" am: b0d9cd61 am: 91190bfa am: 2ac699f1

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



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