Merge "Add back @hide NetworkTemplate methods" am: 123595655a am: 4f0bee34c4

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

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