Merge "Overload DeviceInfoUtils.getSecurityPatch method" into main