Merge "wifi data usage: support to get carrier merged wifi network." am: 8eb01a8a7e am: 1b73eabbce am: 9dd6c5a31e

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

Change-Id: Ie55770f885bf3c917ad485d2bd8c025b676f12b6
tree: 68a9e43c46f95cf1fd8c482b719f54a4a9bb9968
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING