[automerger skipped] Merge "Support to query TYPE_WIFI usage with...

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

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

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

Change-Id: I4b3c6babeb8838e90652a6542d093b8ddae0ddc3