Merge "Fix NetworkTemplate generates non-metered carrier template" am: 70c3d35319 am: 5301fd1488 am: 1361b459c9

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

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