Merge "[MS18] Augment data usage by default" am: de62afa978 am: b633488337 am: 94896b2e30 am: 28ea2d89a6

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

Change-Id: I2ee804bef5429778776d9cd472d57b4e6d87a47a