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