Merge "Resolve CtsSecurityTest issues introduced with CtsDeviceInfo" into sc-dev