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

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

Change-Id: I2121ae767462cf14198db1d23ee45b54070fc7e2