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

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

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