Merge "Fix template for test network needs fine location permission" am: 598ca1e284 am: 78ee9eace8

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

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