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

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

Change-Id: I32496d770421743521fbd26f0e81bbc13ae84788