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

Change-Id: I7403ce419b8d91eb094dc0a212efb7caa1bd6f9a