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

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

Change-Id: Icb67ee3f11a2077f688f8ea6f990f2f50c94e2c5