Merge "carrier data usage: Use carrier template as default policy" am:...

Merge "carrier data usage: Use carrier template as default policy" am: 9eb76885 am: 9dea81b4 am: d34b5806 am: b5694a25

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

Change-Id: If2f1de096a44e1938ab1d731c2081beda3238006