Merge "Add NetworkTemplateTest to common test for cts coverage" am: 132df4ed06

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

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