Merge "b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete"

            @Override

            protected void onQueryComplete(int token, Object cookie, Cursor cursor) {

                synchronized (mTZCallbacks) {

                    if (cursor == null) {

                        mTZQueryInProgress = false;

                        mFirstTZRequest = true;

                        return;

                    }

                    boolean writePrefs = false;

                    // Check the values in the db

                    int keyColumn = cursor.getColumnIndexOrThrow(CalendarCache.KEY);