Merge "Bug #524571 android.voiceinteraction.cts.VoiceInteractionTest--testAll fail" into marshmallow-cts-dev
am: dcca1c507f

* commit 'dcca1c507fb004c96de96595d943f456fb00bdd8':
  Bug #524571 android.voiceinteraction.cts.VoiceInteractionTest--testAll fail