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

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



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