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: Ia871baa3e17da9e4f5b189ca5d514d81e6bbb2a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>