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

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

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