Merge "SELinux permissions for companion device system service"