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

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

Change-Id: Icd61dbba3f56d223602ea0277fb6c5a78b3c1ae5