Merge changes from topic "70360793" into oreo-mr1-cts-dev

* changes:
  Refactor PermissionPolicyTest
  Fix CTS permission groups for CarService