Merge "Adding sleep time in TrustedVoiceHostTest#testUnlock" into nougat-mr1-cts-dev am: 1be9f964f2
am: d513f7dc68

Change-Id: I6d41da6388700bfa65faba0e340a322072551b78