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

Merge "Fix NetworkTemplate generates non-metered carrier template" am: 70c3d353 am: 5301fd14 am: 1361b459 am: 7fa2bca3 am: a09f3f8d

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



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