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

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

Change-Id: I01b6790de48a514256f51ebb85226e56c6e2f59b
tree: 40153d150e5675d2f376023fd330dda69b90c148
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING