[automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 627c446560 -s ours am: 52a0b90b3b -s ours am: a3be01c3df -s ours

am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 614551c3b6 is already in history

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

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