Add [device|service] gdx discovery flags am: 1b015ed2 am: 6b7266ea am: 1fa2c2a2

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



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