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