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

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

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