Merge changes I3e663483,I7fdc7038 into oreo-mr1-cts-dev

* changes:
  Removing Kernel Settings Test from STS
  Service Permissions Tests should not be a part of STS