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

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

Change-Id: Ia115b6c8fe536d77071744374f5d42390cc50dbd
tree: e7c17cd39a1b5c542727166d2adbf578c988fcb7
  1. core/
  2. services/