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"