Merge "Relax timeout duration" into oreo-cts-dev am: 385fffb1c0 am: 7aaaf0de7b am: 11253a4318 am: bebd81cf90
am: 667f5cc342

Change-Id: I5755f9c6de667900e2e2980c7f2ac65dc8940b9b