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

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

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