Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev