[automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 627c446560 am: d076719b77 -s ours am: 495e306e84 -s ours

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

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

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