Merge "Update FakeUid with new methods" into nyc-mr1-dev

    public Timer getBluetoothScanTimer() {

        return null;

    }

    @Override

    public long getWifiRadioApWakeupCount(int which) {

        return 0;

    }

    @Override

    public long getMobileRadioApWakeupCount(int which) {

        return 0;

    }

}