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

Merge "wifi data usage: support to get carrier merged wifi network." am: bef2f5be am: debea981 am: 638b67a5

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

Change-Id: Ie55770f885bf3c917ad485d2bd8c025b676f12b6