Merge "Revert "Support getting transform state in IpSecService"" into main