Merge "flags: add defer_device_discovery_state_change_until_rnr_complete" into...

Merge "flags: add defer_device_discovery_state_change_until_rnr_complete" into main am: d9a69d80 am: 0de1e63d

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



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