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: b22d36f2

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



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