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

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

Change-Id: I108140eddbb817aabf5da6e638148512f7e638b1