Merge "Null check for early watchdog-caught thread hangs" into qt-dev

            // deadlock and the watchdog as a whole to be ineffective)

            Thread dropboxThread = new Thread("watchdogWriteToDropbox") {

                    public void run() {

                        // If a watched thread hangs before init() is called, we don't have a

                        // valid mActivity. So we can't log the error to dropbox.

                        if (mActivity != null) {

                            mActivity.addErrorToDropBox(

                                    "watchdog", null, "system_server", null, null, null,

                                    subject, null, stack, null);

                        }

                        StatsLog.write(StatsLog.SYSTEM_SERVER_WATCHDOG_OCCURRED, subject);

                    }

                };