Merge "Support to query TYPE_WIFI usage with subscriberId" am: ced78f535c

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

Change-Id: I753603201bd935af055cf25135e4f8faf436bf2a