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

Change-Id: I9c5a895e55c55e6803281fe646f54290eecc7005