Merge "[MS76] Remove NetworkTemplate hidden api dependencies in NPMS" am: 51b03bb79c

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

Change-Id: If4df10001b0c5562ef9f6009ff598b10906c1e55