Merge "Revert "[DeviceAware] Use AttributionSourceState in native AppOp..."" into main