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

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

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