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

Change-Id: I42d24a35eaf62ad89a9cb32cfc640c64e2745946