Merge "Merge "Expanding maximum waits for device to be online time as 2 minutes from standard boot timeout." into oreo-mr1-cts-dev am: 85b0cdb4ac"