Merge "[MS74] Expose NetworkTemplate#matches" am: 05e7864df4 am: 1adb855b0e am: 99b69aa9f9

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

Change-Id: Idc8add9dc5d9a694cf6c4e1d05ff44a3fbcc7f18