[automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 8d16935478 -s ours

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

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

Change-Id: If1a3eeb5077d7b078a3be260e01c4cf3f6790437
tree: f689c0d07e020b46eb8554ddb7edb0d64a03d42d
  1. core/
  2. services/