Merge "Fix system_server watchdog timeout" into qt-dev
am: 4bb49a7b07

Change-Id: I1bdf728e3cad37a66bab21116902a5b15359fb1c