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

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

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