Merge "Watchdog race condition when sending message out of synchronized"

    public void run() {

        boolean waitedHalf = false;

        while (true) {

            mCompleted = false;

            mHandler.sendEmptyMessage(MONITOR);

            final String name;

            synchronized (this) {

                long timeout = TIME_TO_WAIT;

                mCompleted = false;

                mHandler.sendEmptyMessage(MONITOR);

                // NOTE: We use uptimeMillis() here because we do not want to increment the time we

                // wait while asleep. If the device is asleep then the thing that we are waiting