Merge "Support to query TYPE_WIFI usage with subscriberId"