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

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

Change-Id: Ie55770f885bf3c917ad485d2bd8c025b676f12b6
tree: db5d5b867b37f615dd241a20eeafae634196c31b
  1. core/
  2. services/