Merge "Address API council feedback for setDiscoveryTechnology flags" into main am: 641ad04275

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2941248

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