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

Change-Id: Ie7f261453aa47ae796753c5ac707c23a3e5c88c3