Merge "SystemServer: fix StartIpSecService trace and log"