Merge "Add network health check watchdog triggered rollback tests" into qt-dev
am: 80b53bd68b

Change-Id: I0fec8433bab94a7837e2f6ae522f91ba5b9f7e19