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

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

Change-Id: Ie10a2dfe6c959a591cda641863af873eea409a37