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 am: ba1e6437

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

Change-Id: Idc579a30794a6a518ed7b22e56cebc87876b8e03