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

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

Change-Id: Ie10a2dfe6c959a591cda641863af873eea409a37
tree: 1ad1f374538b88801d54bcafcfe8637c47e0fbf0
  1. core/
  2. services/