am 9f12f80d: am 18c9394c: Merge "Add SELinux checks when adding a service."

* commit '9f12f80d4af350789a64f5c30531ce790d9b6ea3':
  Add SELinux checks when adding a service.