Merge "[MS18] Augment data usage by default" am: de62afa978 am: 9b52bb78d2

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

Change-Id: I2121ae767462cf14198db1d23ee45b54070fc7e2
tree: beae01f47e8f2dc376026d93095cd4629aea7e45
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/