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

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

Change-Id: I28386f42011e5b65cc1219b947eff2057d1f0848
tree: 6ed57b16abee3a8a35d95385bff4a56f23a55c4d
  1. core/
  2. services/