Merge "Support to query TYPE_WIFI usage with subscriberId" am: 15672a8a12 am: 722aab0208

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

Change-Id: Ifeaab15fbf20b318bb7b35aa6b4604f21e2c98a1
tree: 13b3c888bb582952f41a7200a9e78b1912c8dafc
  1. core/
  2. services/