Merge "Use case-insensitive matching in discovery/advertising" am: c61c5788fe

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

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