Merge "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" into nyc-mr1-dev
am: 7f3735410c

Change-Id: I8a5fcf664c8e1d245de6d0893c72711ca4e4e2ba