Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 627c446560

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

Change-Id: Ic4c5fc6e7fa3b78e52c529b597ca36a5390472e2