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

Change-Id: I7cc1fac7ff47568bfb2dbcd09db938e7dde3388b