Merge "Fix NetworkTemplate generates non-metered carrier template" am: 481b2649f7 am: d3a90fb206 am: e6616d1c7c

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

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