Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev