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

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

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