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

Change-Id: I111eafbe1fa3525586a0bb91c8e8a2f480676d97