Merge "Increase timeout for reboot to 3 min" into android12-tests-dev