[automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d -s ours am: 4b84bc4feb -s ours am: df13ccb4ad -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 645be7b586 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622496
Change-Id: I4b3c6babeb8838e90652a6542d093b8ddae0ddc3
This commit is contained in: