Merge "Merge "Fix turning off duing parallel testing and multiple ITS activities" into nougat-cts-dev am: 8618bdab0e" into nougat-mr1-cts-dev
am: ac29576147

Change-Id: I63695134ec7cf579372223b9b05d310bbc01407d