Merge "Fix NetworkTemplate generates non-metered carrier template" am: 70c3d35319

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

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