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

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

Change-Id: Ia115b6c8fe536d77071744374f5d42390cc50dbd