Merge "Move killswitch tests to postsubmit." am: a8e332b481 am: ca479ea1ce am: 8e1465216d

Original change: https://android-review.googlesource.com/c/platform/cts/+/1580713

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a0d983804a143719d7615c01c9c7c941cd2691d