Merge "Merge "Add watchdog triggered staged rollback test" into qt-dev am: 7364b0e889 am: 17b89c58a8" into qt-r1-dev-plus-aosp