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

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

Change-Id: Ic5ccb7396485e4422f25643d6bb2d6fdad590d27