Merge "[DeviceAwareAppOp] Add device Id in OpEventProxyInfo" into main