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

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

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