Merge "Wrong log filter in TrustedVoiceHostTest#testUnlock" into nougat-cts-dev