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

Change-Id: I5d2cb7e652e6dcb30b6a317c18f3b9aa4f73ab4d