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

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

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