Merge "[MS74] Expose NetworkTemplate#matches" am: 4f6a232bb4 am: 946b17a690

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

Change-Id: Icb67ee3f11a2077f688f8ea6f990f2f50c94e2c5
tree: 1214720d6043e3d0bea99fd0fccb338bb4621045
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/