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

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

Change-Id: I753603201bd935af055cf25135e4f8faf436bf2a
tree: c18f9e79b7fca6bc417d05801ef1c3107fa203f9
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING