Merge "Increase global timeout for long-running testcase." into nougat-cts-dev am: a69f8c27bc am: 4b00843fb9 am: 2649207128 am: d5c01b91f9 am: 6ca37f9bef
am: 4e75bdcb26

Change-Id: I63d9262c5902421cf05e806f132ee152bab7b84c