Merge "Increase ANR test timeouts"