Merge "Fix testRegisterUsageCallback"

        // verify service has empty history for wifi

        assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);

        String callingPackage = "the.calling.package";

        long thresholdInBytes = 1L;  // very small; should be overriden by framework

        DataUsageRequest inputRequest = new DataUsageRequest(

                DataUsageRequest.REQUEST_ID_UNSET, sTemplateWifi, thresholdInBytes);

        // Register and verify request and that binder was called

        DataUsageRequest request =

                mService.registerUsageCallback(callingPackage, inputRequest,

                mService.registerUsageCallback(mServiceContext.getOpPackageName(), inputRequest,

                        messenger, mBinder);

        assertTrue(request.requestId > 0);

        assertTrue(Objects.equals(sTemplateWifi, request.template));