Merge "Updating CTS code, to enable only system app at the time of tear down" into oreo-cts-dev
am: a0f7abc423

Change-Id: Iab8a0e868be9ba8d921ef552458743b6a85280c9