Merge "Support to query TYPE_WIFI usage with subscriberId" am: d8a067cd9e

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

Change-Id: I753603201bd935af055cf25135e4f8faf436bf2a
tree: 3e4e4e5025f2e838db32a98fc2eac8f2df492a6f
  1. core/
  2. services/