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

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

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

Change-Id: Ia29b8d3dd8131762bcbbb7e8e075e2fe3d3bbbe9