Merge "Increase arbitrary wait for boot." into nougat-cts-dev am: 9804a4532c am: af98056c36 am: 5d05f10ef9 am: 41d4b52661 am: b7d3406fa5
am: c5e1634623

Change-Id: I3d57b205468a01bcd4b1532870e2c100141ab1b4