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

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

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