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

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