Merge "Fix NetworkTemplate generates non-metered carrier template" am: 70c3d353 am: 5301fd14

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065438



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