Merge "Bug #236588:android.voiceinteraction.cts.LocalVoiceInteractionTest#testLifecycle fail with 7.0_r5" into nougat-cts-dev