Merge "Make Native Watchdog trigger RollbackManager rollback" into qt-dev
am: bcbf219f5b

Change-Id: I2c119decefc7d88e08f901b0fb60f59444fbf968