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