Merge "Modify timeout of testDirectBootEmulated test case" into nougat-cts-dev
am: 013bfe3b78

Change-Id: Ibd89df9f6c69f853e72865af24bbeb7829df9da3