Merge "Add back @hide NetworkTemplate methods" am: 123595655a am: 256d304921

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2500322

Change-Id: I706df010b554d0db5f25cb7ba66ba55fa6309b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>