Merge "Extend the Stress#mockALot() timeout for CTS." am: 14081cd0e4 am: e1a1eceb9a
am: d8cf9a5c46

Change-Id: Icc97c3238c791bb08090f6c12adaac119082dad0