[automerger skipped] Merge "Address API council feedback for setDiscoveryTechnology flags" into main am: 641ad04275 am: 9c18676cc6 -s ours

am skip reason: Merged-In I1493624bcae2dbd0723fc50214ff22360135bc16 with SHA-1 c867314a68 is already in history

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

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