Merge "Merge "Increase timeout for reboot to 3 min" into android12-tests-dev am: f0c475a29f" into android12L-tests-dev